From 8b1b9f8c5553817ef70bd1a8144001299a406494 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 Aug 2017 14:30:47 -0400 Subject: [PATCH] Drop api that is only for unmanaged dnd These functions are not needed as public api anymore. --- docs/reference/gdk/gdk4-sections.txt | 3 --- gdk/gdkdnd.c | 15 +++------------ gdk/gdkdnd.h | 16 ---------------- gdk/gdkdndprivate.h | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index ec1159476a..625b15457d 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -840,15 +840,12 @@ gdk_cursor_get_type GdkDragContext GdkDragCancelReason gdk_drag_get_selection -gdk_drag_abort gdk_drop_reply -gdk_drag_drop gdk_drag_drop_done gdk_drag_find_window gdk_drag_begin gdk_drag_begin_for_device gdk_drag_begin_from_point -gdk_drag_motion gdk_drop_finish GdkDragProtocol GdkDragAction diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index 7b9638d430..94d256595b 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -416,7 +416,7 @@ gdk_drag_status (GdkDragContext *context, GDK_DRAG_CONTEXT_GET_CLASS (context)->drag_status (context, action, time_); } -/** +/* * gdk_drag_motion: * @context: a #GdkDragContext * @dest_window: the new destination window, obtained by @@ -433,9 +433,6 @@ gdk_drag_status (GdkDragContext *context, * * This function is called by the drag source. * - * This function does not need to be called in managed drag and drop - * operations. See gdk_drag_context_manage_dnd() for more information. - * * Returns: */ gboolean @@ -461,7 +458,7 @@ gdk_drag_motion (GdkDragContext *context, time_); } -/** +/* * gdk_drag_abort: * @context: a #GdkDragContext * @time_: the timestamp for this operation @@ -469,9 +466,6 @@ gdk_drag_motion (GdkDragContext *context, * Aborts a drag without dropping. * * This function is called by the drag source. - * - * This function does not need to be called in managed drag and drop - * operations. See gdk_drag_context_manage_dnd() for more information. */ void gdk_drag_abort (GdkDragContext *context, @@ -482,7 +476,7 @@ gdk_drag_abort (GdkDragContext *context, GDK_DRAG_CONTEXT_GET_CLASS (context)->drag_abort (context, time_); } -/** +/* * gdk_drag_drop: * @context: a #GdkDragContext * @time_: the timestamp for this operation @@ -490,9 +484,6 @@ gdk_drag_abort (GdkDragContext *context, * Drops on the current destination. * * This function is called by the drag source. - * - * This function does not need to be called in managed drag and drop - * operations. See gdk_drag_context_manage_dnd() for more information. */ void gdk_drag_drop (GdkDragContext *context, diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h index b86bc7be90..e29a07d3ad 100644 --- a/gdk/gdkdnd.h +++ b/gdk/gdkdnd.h @@ -134,7 +134,6 @@ GDK_AVAILABLE_IN_ALL GdkDragProtocol gdk_drag_context_get_protocol (GdkDragContext *context); /* Destination side */ - GDK_AVAILABLE_IN_ALL void gdk_drag_status (GdkDragContext *context, GdkDragAction action, @@ -176,21 +175,6 @@ void gdk_drag_find_window (GdkDragContext *context, GdkDragProtocol *protocol); GDK_AVAILABLE_IN_ALL -gboolean gdk_drag_motion (GdkDragContext *context, - GdkWindow *dest_window, - GdkDragProtocol protocol, - gint x_root, - gint y_root, - GdkDragAction suggested_action, - GdkDragAction possible_actions, - guint32 time_); -GDK_AVAILABLE_IN_ALL -void gdk_drag_drop (GdkDragContext *context, - guint32 time_); -GDK_AVAILABLE_IN_ALL -void gdk_drag_abort (GdkDragContext *context, - guint32 time_); -GDK_AVAILABLE_IN_ALL gboolean gdk_drag_drop_succeeded (GdkDragContext *context); GDK_AVAILABLE_IN_3_20 diff --git a/gdk/gdkdndprivate.h b/gdk/gdkdndprivate.h index bf0ab8bd89..e4c223b0bd 100644 --- a/gdk/gdkdndprivate.h +++ b/gdk/gdkdndprivate.h @@ -123,6 +123,21 @@ gboolean gdk_drag_context_handle_dest_event (GdkEvent *event); GdkCursor * gdk_drag_get_cursor (GdkDragContext *context, GdkDragAction action); +gboolean gdk_drag_motion (GdkDragContext *context, + GdkWindow *dest_window, + GdkDragProtocol protocol, + gint x_root, + gint y_root, + GdkDragAction suggested_action, + GdkDragAction possible_actions, + guint32 time_); +void gdk_drag_abort (GdkDragContext *context, + guint32 time_); +void gdk_drag_drop (GdkDragContext *context, + guint32 time_); + + + G_END_DECLS #endif -- 2.30.2